From 22c732d868f272cf10b71a8f4293f00ec38440e7 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Tue, 10 Oct 2017 20:28:41 +0100
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 454964 -> 455692 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index 53a04ddaf42..0ab7edca475 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -863,7 +863,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 		odk_unowinreg \
 	) \
diff --git a/configure.ac b/configure.ac
index 1763f6c734cfedbf6e5599704a2c6f0d238be2f5..4013db8059419d6b4b2448cfa80a149345112781 100644
GIT binary patch
delta 582
zcmY+BPiPZC6vmmnN!{JFk#-5`Kgl#PNu@1C)RQD6SSU$_9ts7~7`A3(Q_HTH81Z7_
zDIh&H;3r=6;K@j`flARs!IL-fnv=nk2o?`syg7+!paYMY_xOG9J-#{kKC|~@rh33W
zM!cGk=jM)4HgfizO#Ra{AF5$Cer8aC5n|KB<Xf0Ud0MjYL|7;~U_`D^G`4olqPS~X
z<^!Wtuq|Qd#rn#cIDw~NN7x0hO*V(sDK;@|nG7)<jWE*#{Y^59i~l!zR48p{2Lob{
z&0?n3h%gzh!$yQsHNRLgMDV<6^#*6{+`XWfiwVm{vf|R8XSo|rg}L!-k0$Z;EsbNL
zMH9H*q%o{9es(y%of?_NjV4_}yg{>g)0Dhc=3_Y8Clz0sviABm<M`R60Cp-eeZshg
zXp5$?a6~%1J@{6O{B=iBkSKF6p0?;B-n}OU)ed>;T@Oe6Say5Wq4|Ed`qHR^;}*rx
z{XnBwcIX^l{v|&)9J+$K$|rjQ1uq<l#6L3y-F@QdIOK!>kM!%li@PtYy`Ot%70r@J
zCpVKT>(?|jU+B9hFLSqO_TQ%n{B~%5d4Q)jR?|`y6fqH$4hOG_(za=7>M4bmFMuW7
SdM(f<8C-_@Fwh?HCH?`V*t;$O

delta 232
zcmeBqA-(01bi)?LU25&o8jL{9v^`pb*{Xf|gjLMK(-mejaZT^*W0sh{eloM*bj^*-
zLes<5n0TjuSjEgb-D3l@-gMSn7J=!yQ<yoXPuc)fC%G1=<iG}InduKUFw0NB9mpy&
z{lQyiuIcaAGmA|xf6B-=Il!4^`rBj{&gu8}0(B*C1lseUnu%|E&qij$>37yLdrp_z
z#B4A<Y!kEM^xB!s{L`mxV%DABwv16=`r}Q^w!&VHVU8~T&Yr>UUO>uLsWP>Adf-78
f(dn}`GfPi@IgeSkop%c}5VHU=>vrBPZ2#>6&4E>1

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index dc983e2f67d..538409f7aee 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated) \
 		$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index a72102c9b95..321d76dc6a8 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -42,11 +42,13 @@ ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	$(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
 	GeneratedPackage_uno_loader_classes \
 	$(if $(filter WNT,$(OS)),Library_unowinreg) \
 	Package_unowinreg \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 ))
 endif
 
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 03b58fe3da7..63e332079bc 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2